From 32e8db2d6982a93206f6c141dd4be8b46acc6408 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 6 Aug 2014 16:11:18 -0700 Subject: [PATCH] Update rust-url with a contained bugfix --- Cargo.lock | 4 ++-- src/cargo/ops/cargo_test.rs | 2 +- tests/test_cargo_generate_lockfile.rs | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf681f64b..496d5731b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7,7 +7,7 @@ dependencies = [ "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git#c23b8769f20f306c59a96b22532bb09b33faa764)", "semver 0.0.1 (git+https://github.com/rust-lang/semver#e17191f51d543529a6f07e6731802b77977fcef8)", "toml 0.1.0 (git+https://github.com/alexcrichton/toml-rs#934e093047ae15432fcc772d4e01fdf5fd56d2fb)", - "url 0.1.0 (git+https://github.com/servo/rust-url#ad61773abc56d812f8abe4bc78833f422a5f6a94)", + "url 0.1.0 (git+https://github.com/servo/rust-url#143d902a9c35694e0b4835313db238c3833f0f52)", ] [[package]] @@ -46,7 +46,7 @@ source = "git+https://github.com/alexcrichton/toml-rs#934e093047ae15432fcc772d4e [[package]] name = "url" version = "0.1.0" -source = "git+https://github.com/servo/rust-url#ad61773abc56d812f8abe4bc78833f422a5f6a94" +source = "git+https://github.com/servo/rust-url#143d902a9c35694e0b4835313db238c3833f0f52" dependencies = [ "encoding 0.1.0 (git+https://github.com/lifthrasiir/rust-encoding#eae7c261f50cfbdc699e9b234d2b13d4d255fd42)", ] diff --git a/src/cargo/ops/cargo_test.rs b/src/cargo/ops/cargo_test.rs index 60257142e..cc7d22fb6 100644 --- a/src/cargo/ops/cargo_test.rs +++ b/src/cargo/ops/cargo_test.rs @@ -8,7 +8,7 @@ use util::{process, CargoResult, ProcessError}; pub fn run_tests(manifest_path: &Path, options: &mut ops::CompileOptions, args: &[String]) -> CargoResult> { - let mut source = PathSource::for_path(&manifest_path.dir_path()); + let mut source = try!(PathSource::for_path(&manifest_path.dir_path())); try!(source.update()); let package = try!(source.get_root_package()); diff --git a/tests/test_cargo_generate_lockfile.rs b/tests/test_cargo_generate_lockfile.rs index 0208bdd77..6ff7d5716 100644 --- a/tests/test_cargo_generate_lockfile.rs +++ b/tests/test_cargo_generate_lockfile.rs @@ -1,7 +1,6 @@ use std::io::File; use support::{project, execs, cargo_dir, ResultTest}; -use support::paths::PathExt; use hamcrest::assert_that; fn setup() {} -- 2.30.2